* xml.el (xml-parse-tag): Corrrectly handle comment embedded in non-tag text.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 569dd004f7687a9511e6fd4294eecfd1c2b9824a..a03ee8228f1072060345976669126c05d4e5405b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-24  Chong Yidong  <cyd@gnu.org>
+
+       * xml.el (xml-parse-tag): Correctly handle comment embedded in
+       non-tag text.
+
 2012-06-23  Juanma Barranquero  <lekktu@gmail.com>
 
        * makefile.w32-in (COMPILE_FIRST): Synch with changes in 2012-06-22T21:24:54Z!monnier@iro.umontreal.ca.

diff --git a/lisp/xml.el b/lisp/xml.el
index cb56f023af060a3c43856e4ad35bbd1efca88ad1..d1e824c4ece0f6dc8ebfd13c8b9065f915016994 100644 (file)
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -424,7 +424,8 @@ Returns one of:
       (search-forward "-->")
       (skip-syntax-forward " ")
       (unless (eobp)
-       (xml-parse-tag parse-dtd xml-ns)))
+       (let ((xml-sub-parser t))
+         (xml-parse-tag parse-dtd xml-ns))))
      ;;  end tag
      ((looking-at "</")
       '())